merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Mon, 9 Apr 2007 19:40:25 +0000 (13:40 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Mon, 9 Apr 2007 19:40:25 +0000 (13:40 -0600)

Trivial merge